Substitute gtk_widget_ref/unref with g_object_ref/unref

Substitute the use of gtk_widget_ref/unref in documentation examples
and in internal gtk+ code

https://bugzilla.gnome.org/show_bug.cgi?id=598218

diff --git a/docs/developers.txt b/docs/developers.txt
index e50c8ca1ff057ccdf0f7895a2b55b963ae4df566..66e1d9309b499f3064e38b524f62be0f44a935ad 100644 (file)
--- a/docs/developers.txt
+++ b/docs/developers.txt
@@ -48,15 +48,6 @@ Events that are assured to have a valid GdkEvent.any.window field are
 GDK_EXPOSE             GtkWidget::expose_event
 
 
-gtk_widget_ref() vs. gtk_object_ref()
--------------------------------------
-
-The widget referencing functions gtk_widget_ref() and gtk_widget_unref()
-are currently just wrappers about the corresponding referencing functions
-for objects. Still you should use the widget referencing functions if you
-are sure the referenced object is of type GTK_WIDGET_TYPE.
-
-
 Writing Gdk functions
 ---------------------
 

diff --git a/docs/faq/gtk-faq.sgml b/docs/faq/gtk-faq.sgml
index a4cad444035c293f79eab1bf4c85c04289a2c6ac..b03f904bb00bf19855534353ff4c72c0bc453bdb 100644 (file)
--- a/docs/faq/gtk-faq.sgml
+++ b/docs/faq/gtk-faq.sgml
@@ -2108,10 +2108,10 @@ not.</para>
 snippet:</para>
 
 <programlisting role="C">
-     gtk_widget_ref(widget);
+     g_object_ref(widget);
      gtk_container_remove(GTK_CONTAINER(old_parent), widget);
      gtk_container_add(GTK_CONTAINER(new_parent), widget);
-     gtk_widget_unref(widget);
+     g_object_unref(widget);
 </programlisting>
 
 </sect1>

diff --git a/docs/refcounting.txt b/docs/refcounting.txt
index f8b62ed5e358d8093ff89bb876f2788847662611..5ebf81850204a18bd5c8c6d3add41547a5dcc80b 100644 (file)
--- a/docs/refcounting.txt
+++ b/docs/refcounting.txt
@@ -250,12 +250,12 @@ Example code sequences that require reference wraps:
    /* gtk_container_remove() will unparent the child and therefore
     * cause its reference count to be decremented by one.
     */
-   gtk_widget_ref (widget);
+   g_object_ref (widget);
    gtk_container_remove (container, widget);
    /* without the reference count, the widget would have been destroyed here.
    */
    gtk_container_add (container, widget);
-   gtk_widget_unref (widget);
+   g_object_unref (widget);
 
 
   /* all items in item_list need to be referenced
@@ -267,7 +267,7 @@ Example code sequences that require reference wraps:
    slist = NULL;
    for (list = item_list; list; list = list->next)
    {
-     gtk_widget_ref (GTK_WIDGET (list->data));
+     g_object_ref (GTK_WIDGET (list->data));
      slist = g_slist_prepend (slist, list->data);
    }
    gtk_list_remove_items (list, item_list);
@@ -280,7 +280,7 @@ Example code sequences that require reference wraps:
      
      tmp = slist;
      slist = slist->next;
-     gtk_widget_unref (GTK_WIDGET (tmp->data));
+     g_object_unref (GTK_WIDGET (tmp->data));
      g_slist_free_1 (tmp);
    }
    

diff --git a/docs/tutorial/gtk_tut.sgml b/docs/tutorial/gtk_tut.sgml
index 003f4c7af84339f25efaa9375bb479bacec29922..d42a349b438d44bd89dfce117dafb63dbacef072 100644 (file)
--- a/docs/tutorial/gtk_tut.sgml
+++ b/docs/tutorial/gtk_tut.sgml
@@ -9564,7 +9564,7 @@ which owns it will be collapsed. So, if you want it to stick around,
 do something like the following:
 
 <tscreen><verb>
-gtk_widget_ref (tree);
+g_object_ref (tree);
 owner = GTK_TREE(tree)->tree_owner;
 gtk_container_remove (GTK_CONTAINER(tree), item);
 if (tree->parent == NULL){
@@ -9572,7 +9572,7 @@ if (tree->parent == NULL){
   gtk_tree_item_set_subtree (GTK_TREE_ITEM(owner), tree);
 }
 else
-  gtk_widget_unref (tree);
+  g_object_unref (tree);
 </verb></tscreen>
 
 Finally, drag-n-drop <em>does</em> work with TreeItems. You just

diff --git a/docs/tutorial/gtk_tut_12.es.sgml b/docs/tutorial/gtk_tut_12.es.sgml
index cca7bd9a7f023539dc268a0364bfefc993c569da..22ce28f870f76a7756e7437931b81282cb1ceb8e 100755 (executable)
--- a/docs/tutorial/gtk_tut_12.es.sgml
+++ b/docs/tutorial/gtk_tut_12.es.sgml
@@ -8986,7 +8986,7 @@ se colapsar
 tendrá que hacer algo así:
 
 <tscreen><verb>
-gtk_widget_ref (arbol);
+g_object_ref (arbol);
 propietario = GTK_TREE(arbol)->tree_owner;
 gtk_container_remove (GTK_CONTAINER(arbol), item);
 if (arbol->parent == NULL){
@@ -8994,7 +8994,7 @@ if (arbol->parent == NULL){
   gtk_tree_item_set_subtree (GTK_TREE_ITEM(propietario), arbol);
 }
 else
-  gtk_widget_unref (arbol);
+  g_object_unref (arbol);
 </verb></tscreen>
 
 Finalmente, hay que mencionar que la opción de drag-n-drop (arrastar y

diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index c1488754fbdccf67f90cba1744ac982cf1ce323d..ed286636d5669564cdaf53565e7980a6f6e41d46 100644 (file)
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -863,8 +863,8 @@ GtkRequisition *gtk_requisition_copy     (const GtkRequisition *requisition);
 void            gtk_requisition_free     (GtkRequisition       *requisition);
 
 #if    defined (GTK_TRACE_OBJECTS) && defined (__GNUC__)
-#  define gtk_widget_ref gtk_object_ref
-#  define gtk_widget_unref gtk_object_unref
+#  define gtk_widget_ref g_object_ref
+#  define gtk_widget_unref g_object_unref
 #endif /* GTK_TRACE_OBJECTS && __GNUC__ */
 
 void              _gtk_widget_grab_notify                 (GtkWidget    *widget,